Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 24 Aug 2011 21:07:32 +0000 (14:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 24 Aug 2011 21:07:32 +0000 (14:07 -0700)
commit66808a1b40884e807800211ed3cc6e0f328db41d
treed96a36317f1d3d88245359660e662151dedfb3b7
parent0944f73dff69414c3678b501dd12eea2d071359d
parentf9d128d22c24d4b8817e01130b4ce72bdf628bdd
Merge from trunk.